diff --git a/pixel3_mainline.mk b/pixel3_mainline.mk
index ed3bee9..2446226 100644
--- a/pixel3_mainline.mk
+++ b/pixel3_mainline.mk
@@ -1,3 +1,5 @@
+PIXEL3_KERNEL_DIR := device/linaro/dragonboard-kernel/pixel3_mainline/
+
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, device/linaro/dragonboard/pixel3_mainline/device.mk)
@@ -8,3 +10,17 @@
 PRODUCT_NAME := pixel3_mainline
 PRODUCT_DEVICE := pixel3_mainline
 PRODUCT_BRAND := Android
+
+ifndef PIXEL3_USES_GKI
+PIXEL3_USES_GKI := true
+endif
+
+ifeq ($(PIXEL3_USES_GKI), true)
+PIXEL3_MODS := $(wildcard $(PIXEL3_KERNEL_DIR)/*.ko)
+ifneq ($(PIXEL3_MODS),)
+  BOARD_VENDOR_KERNEL_MODULES += $(PIXEL3_MODS)
+
+  P3_ONLY_VENDOR := %/msm.ko
+  BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(P3_ONLY_VENDOR),$(PIXEL3_MODS))
+endif
+endif
diff --git a/pixel3_mainline/BoardConfig.mk b/pixel3_mainline/BoardConfig.mk
index 03fce75..7f59e9c 100644
--- a/pixel3_mainline/BoardConfig.mk
+++ b/pixel3_mainline/BoardConfig.mk
@@ -4,6 +4,16 @@
 TARGET_BOOTLOADER_BOARD_NAME := pixel3_mainline
 TARGET_BOARD_PLATFORM := pixel3_mainline
 
+# Bootloader/Kernel Configuration
+TARGET_NO_KERNEL	 := false
+BOARD_KERNEL_BAS	 := 0x00000000
+BOARD_KERNEL_PAGESIZE	 := 4096
+BOARD_KERNEL_TAGS_OFFSET := 0x01E00000
+BOARD_RAMDISK_OFFSET     := 0x02000000
+BOARD_KERNEL_CMDLINE	 := firmware_class.path=/vendor/firmware/ androidboot.hardware=pixel3_mainline efi=noruntime
+BOARD_KERNEL_CMDLINE	 += init=/init androidboot.boot_devices=soc/1d84000.ufshc printk.devkmsg=on
+BOARD_KERNEL_CMDLINE	 += androidboot.super_partition=system_b #system_b is super partition
+
 # Image Configuration
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 10737418240
diff --git a/pixel3_mainline/device.mk b/pixel3_mainline/device.mk
index aab118b..ff5f08f 100644
--- a/pixel3_mainline/device.mk
+++ b/pixel3_mainline/device.mk
@@ -19,6 +19,7 @@
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
 
 PRODUCT_COPY_FILES := \
+    $(PIXEL3_KERNEL_DIR)/Image.gz-dtb:kernel \
     device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.pixel3_mainline \
     device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.pixel3_mainline \
     device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.pixel3_mainline \